From ddb4034e8e9932c4b01f75b5543759af81138c4a Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 9 Oct 2013 14:09:35 -0400 Subject: [PATCH] Fix GI warnings --- gdk/gdk.c | 11 ++++------- gtk/gtkaboutdialog.c | 2 +- gtk/gtkcontainer.c | 4 +--- gtk/gtkeditable.c | 12 +++--------- gtk/gtkliststore.c | 6 ++---- gtk/gtkselection.c | 3 +-- gtk/gtktreemodel.c | 8 ++------ gtk/gtktreestore.c | 9 +++------ 8 files changed, 17 insertions(+), 38 deletions(-) diff --git a/gdk/gdk.c b/gdk/gdk.c index befddacbb4..7f51acd0b1 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -821,7 +821,7 @@ gdk_threads_dispatch_free (gpointer data) /** - * gdk_threads_add_idle_full: + * gdk_threads_add_idle_full: (rename-to gdk_threads_add_idle) * @priority: the priority of the idle source. Typically this will be in the * range between #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE * @function: function to call @@ -873,7 +873,6 @@ gdk_threads_dispatch_free (gpointer data) * Return value: the ID (greater than 0) of the event source. * * Since: 2.12 - * Rename to: gdk_threads_add_idle */ guint gdk_threads_add_idle_full (gint priority, @@ -920,7 +919,7 @@ gdk_threads_add_idle (GSourceFunc function, /** - * gdk_threads_add_timeout_full: + * gdk_threads_add_timeout_full: (rename-to gdk_threads_add_timeout) * @priority: the priority of the timeout source. Typically this will be in the * range between #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE. * @interval: the time between calls to the function, in milliseconds @@ -976,7 +975,6 @@ gdk_threads_add_idle (GSourceFunc function, * Return value: the ID (greater than 0) of the event source. * * Since: 2.12 - * Rename to: gdk_threads_add_timeout */ guint gdk_threads_add_timeout_full (gint priority, @@ -1028,7 +1026,7 @@ gdk_threads_add_timeout (guint interval, /** - * gdk_threads_add_timeout_seconds_full: + * gdk_threads_add_timeout_seconds_full: (rename-to gdk_threads_add_timeout_seconds) * @priority: the priority of the timeout source. Typically this will be in the * range between #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE. * @interval: the time between calls to the function, in seconds @@ -1040,10 +1038,9 @@ gdk_threads_add_timeout (guint interval, * See g_timeout_add_seconds_full() for a discussion of why it is * a good idea to use this function if you don't need finer granularity. * - * Return value: the ID (greater than 0) of the event source. + * Return value: the ID (greater than 0) of the event source. * * Since: 2.14 - * Rename to: gdk_threads_add_timeout_seconds */ guint gdk_threads_add_timeout_seconds_full (gint priority, diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index 62d563f1ca..526fe3ddc8 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -1128,7 +1128,7 @@ gtk_about_dialog_get_copyright (GtkAboutDialog *about) /** * gtk_about_dialog_set_copyright: * @about: a #GtkAboutDialog - * @copyright: (allow-none) the copyright string + * @copyright: (allow-none): the copyright string * * Sets the copyright string to display in the about dialog. * This should be a short string of one or two lines. diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index be375b06ed..3df2c72a1d 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -2113,7 +2113,7 @@ gtk_container_class_handle_border_width (GtkContainerClass *klass) } /** - * gtk_container_forall: + * gtk_container_forall: (virtual forall) * @container: a #GtkContainer * @callback: (scope call) (closure callback_data): a callback * @callback_data: callback user data @@ -2124,8 +2124,6 @@ gtk_container_class_handle_border_width (GtkContainerClass *klass) * of the container, but were added by the container implementation * itself. Most applications should use gtk_container_foreach(), * rather than gtk_container_forall(). - * - * Virtual: forall **/ void gtk_container_forall (GtkContainer *container, diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c index 43dfd45564..93c83d1bf0 100644 --- a/gtk/gtkeditable.c +++ b/gtk/gtkeditable.c @@ -185,7 +185,7 @@ gtk_editable_base_init (gpointer g_class) } /** - * gtk_editable_insert_text: + * gtk_editable_insert_text: (virtual do_insert_text) * @editable: a #GtkEditable * @new_text: the text to append * @new_text_length: the length of the text in bytes, or -1 @@ -196,8 +196,6 @@ gtk_editable_base_init (gpointer g_class) * * Note that the position is in characters, not in bytes. * The function updates @position to point after the newly inserted text. - * - * Virtual: do_insert_text */ void gtk_editable_insert_text (GtkEditable *editable, @@ -215,7 +213,7 @@ gtk_editable_insert_text (GtkEditable *editable, } /** - * gtk_editable_delete_text: + * gtk_editable_delete_text: (virtual do_delete_text) * @editable: a #GtkEditable * @start_pos: start position * @end_pos: end position @@ -226,8 +224,6 @@ gtk_editable_insert_text (GtkEditable *editable, * are those from @start_pos to the end of the text. * * Note that the positions are specified in characters, not bytes. - * - * Virtual: do_delete_text */ void gtk_editable_delete_text (GtkEditable *editable, @@ -360,7 +356,7 @@ gtk_editable_delete_selection (GtkEditable *editable) } /** - * gtk_editable_select_region: + * gtk_editable_select_region: (virtual set_selection_bounds) * @editable: a #GtkEditable * @start_pos: start of region * @end_pos: end of region @@ -372,8 +368,6 @@ gtk_editable_delete_selection (GtkEditable *editable) * the end of the text. * * Note that positions are specified in characters, not bytes. - * - * Virtual: set_selection_bounds */ void gtk_editable_select_region (GtkEditable *editable, diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index 7407e667dd..223b1397d6 100644 --- a/gtk/gtkliststore.c +++ b/gtk/gtkliststore.c @@ -459,14 +459,13 @@ gtk_list_store_new (gint n_columns, /** - * gtk_list_store_newv: + * gtk_list_store_newv: (rename-to gtk_list_store_new) * @n_columns: number of columns in the list store * @types: (array length=n_columns): an array of #GType types for the columns, from first to last * * Non-vararg creation function. Used primarily by language bindings. * * Return value: (transfer full): a new #GtkListStore - * Rename to: gtk_list_store_new **/ GtkListStore * gtk_list_store_newv (gint n_columns, @@ -1073,7 +1072,7 @@ gtk_list_store_set_valist_internal (GtkListStore *list_store, } /** - * gtk_list_store_set_valuesv: + * gtk_list_store_set_valuesv: (rename-to gtk_list_store_set) * @list_store: A #GtkListStore * @iter: A valid #GtkTreeIter for the row being modified * @columns: (array length=n_values): an array of column numbers @@ -1087,7 +1086,6 @@ gtk_list_store_set_valist_internal (GtkListStore *list_store, * change is not known until run-time. * * Since: 2.12 - * Rename to: gtk_list_store_set */ void gtk_list_store_set_valuesv (GtkListStore *list_store, diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 84bba6d260..80bdc80be1 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -1246,7 +1246,7 @@ gtk_selection_data_get_length (const GtkSelectionData *selection_data) } /** - * gtk_selection_data_get_data_with_length: + * gtk_selection_data_get_data_with_length: (rename-to gtk_selection_data_get_data) * @selection_data: a pointer to a #GtkSelectionData structure * @length: (out): return location for length of the data segment * @@ -1254,7 +1254,6 @@ gtk_selection_data_get_length (const GtkSelectionData *selection_data) * * Returns: (array length=length): the raw data of the selection * - * Rename to: gtk_selection_data_get_data * Since: 3.0 */ const guchar* diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index 6e40444baf..1a8a9fc94a 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -839,7 +839,7 @@ gtk_tree_path_get_indices (GtkTreePath *path) } /** - * gtk_tree_path_get_indices_with_depth: + * gtk_tree_path_get_indices_with_depth: (rename-to gtk_tree_path_get_indices) * @path: a #GtkTreePath * @depth: (out) (allow-none): return location for number of elements * returned in the integer array, or %NULL @@ -854,8 +854,6 @@ gtk_tree_path_get_indices (GtkTreePath *path) * indices, or %NULL * * Since: 3.0 - * - * Rename to: gtk_tree_path_get_indices */ gint * gtk_tree_path_get_indices_with_depth (GtkTreePath *path, @@ -1896,7 +1894,7 @@ gtk_tree_model_rows_reordered (GtkTreeModel *tree_model, } /** - * gtk_tree_model_rows_reordered_with_length: + * gtk_tree_model_rows_reordered_with_length: (rename-to gtk_tree_model_rows_reordered) * @tree_model: a #GtkTreeModel * @path: a #GtkTreePath pointing to the tree node whose children * have been reordered @@ -1914,8 +1912,6 @@ gtk_tree_model_rows_reordered (GtkTreeModel *tree_model, * This should be called by models when their rows have been * reordered. * - * Rename to: gtk_tree_model_rows_reordered - * * Since: 3.10 */ void diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index bbf6e5d9a9..da0cc46b70 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -344,14 +344,13 @@ gtk_tree_store_new (gint n_columns, return retval; } /** - * gtk_tree_store_newv: + * gtk_tree_store_newv: (rename-to gtk_tree_store_new) * @n_columns: number of columns in the tree store * @types: (array length=n_columns): an array of #GType types for the columns, from first to last * * Non vararg creation function. Used primarily by language bindings. * * Return value: (transfer full): a new #GtkTreeStore - * Rename to: gtk_tree_store_new **/ GtkTreeStore * gtk_tree_store_newv (gint n_columns, @@ -1076,7 +1075,7 @@ gtk_tree_store_set_valist_internal (GtkTreeStore *tree_store, } /** - * gtk_tree_store_set_valuesv: + * gtk_tree_store_set_valuesv: (rename-to gtk_tree_store_set) * @tree_store: A #GtkTreeStore * @iter: A valid #GtkTreeIter for the row being modified * @columns: (array length=n_values): an array of column numbers @@ -1089,7 +1088,6 @@ gtk_tree_store_set_valist_internal (GtkTreeStore *tree_store, * the number of columns to change is not known until run-time. * * Since: 2.12 - * Rename to: gtk_tree_store_set **/ void gtk_tree_store_set_valuesv (GtkTreeStore *tree_store, @@ -1577,7 +1575,7 @@ gtk_tree_store_insert_with_values (GtkTreeStore *tree_store, } /** - * gtk_tree_store_insert_with_valuesv: + * gtk_tree_store_insert_with_valuesv: (rename-to gtk_tree_store_insert_with_values) * @tree_store: A #GtkTreeStore * @iter: (out) (allow-none): An unset #GtkTreeIter to set the new row, or %NULL. * @parent: (allow-none): A valid #GtkTreeIter, or %NULL @@ -1591,7 +1589,6 @@ gtk_tree_store_insert_with_values (GtkTreeStore *tree_store, * function is mainly intended for language bindings. * * Since: 2.10 - * Rename to: gtk_tree_store_insert_with_values */ void gtk_tree_store_insert_with_valuesv (GtkTreeStore *tree_store, -- 2.30.2